Handle mask == NULL in shape_combine_mask

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 8fdb622ec3a2523ac6aef64b9c4d91646098584c..01e4ef71bd44a3ba50248b95cf7e206d6888b9af 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6219,7 +6219,10 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 
   private = (GdkWindowObject *) window;
 
-  region = _gdk_windowing_get_shape_for_mask (mask);
+  if (mask)
+    region = _gdk_windowing_get_shape_for_mask (mask);
+  else
+    region = NULL;
 
   gdk_window_shape_combine_region (window,
                                   region,
@@ -6383,7 +6386,10 @@ gdk_window_input_shape_combine_mask (GdkWindow *window,
 
   private = (GdkWindowObject *) window;
 
-  region = _gdk_windowing_get_shape_for_mask (mask);
+  if (mask)
+    region = _gdk_windowing_get_shape_for_mask (mask);
+  else
+    region = NULL;
 
   gdk_window_input_shape_combine_region (window,
                                         region,